Merge tag 'upstream/0.6.0' into debian/sid
authorLuca Bruno <lucab@debian.org>
Thu, 3 Dec 2015 23:38:05 +0000 (00:38 +0100)
committerLuca Bruno <lucab@debian.org>
Thu, 3 Dec 2015 23:38:05 +0000 (00:38 +0100)
Upstream version 0.6.0


Trivial merge